Auto merge of #4244 - est31:master, r=matklad
authorbors <bors@rust-lang.org>
Sun, 2 Jul 2017 11:08:30 +0000 (11:08 +0000)
committerbors <bors@rust-lang.org>
Sun, 2 Jul 2017 11:08:30 +0000 (11:08 +0000)
Let the cargo_bench_failing_test tolerate col info

Needed by https://github.com/rust-lang/rust/pull/42938


Trivial merge